From b33307b7906dc55162bbb85bba14017577811917 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 6 May 2004 15:40:18 +0000 Subject: [PATCH] in RTL mode, position the title lable next to the arrow just as we do for 2004-05-06 Sven Neumann * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, position the title lable next to the arrow just as we do for LTR rendering. Fixes bug #141825. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkexpander.c | 11 +++++++++-- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7844d5ab7..19f858a2be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-06 Sven Neumann + + * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, + position the title lable next to the arrow just as we do for LTR + rendering. Fixes bug #141825. + 2004-05-06 Matthias Clasen * docs/RELEASE-HOWTO: Document the new policy of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c7844d5ab7..19f858a2be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-05-06 Sven Neumann + + * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, + position the title lable next to the arrow just as we do for LTR + rendering. Fixes bug #141825. + 2004-05-06 Matthias Clasen * docs/RELEASE-HOWTO: Document the new policy of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c7844d5ab7..19f858a2be 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-05-06 Sven Neumann + + * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, + position the title lable next to the arrow just as we do for LTR + rendering. Fixes bug #141825. + 2004-05-06 Matthias Clasen * docs/RELEASE-HOWTO: Document the new policy of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c7844d5ab7..19f858a2be 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-05-06 Sven Neumann + + * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, + position the title lable next to the arrow just as we do for LTR + rendering. Fixes bug #141825. + 2004-05-06 Matthias Clasen * docs/RELEASE-HOWTO: Document the new policy of diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index eace48f019..7deb7bbe9e 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -614,9 +614,16 @@ gtk_expander_size_allocate (GtkWidget *widget, ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL; - label_allocation.x = widget->allocation.x + border_width + focus_width + focus_pad; if (ltr) - label_allocation.x += expander_size + 2 * expander_spacing; + label_allocation.x = (widget->allocation.x + + border_width + focus_width + focus_pad + + expander_size + 2 * expander_spacing); + else + label_allocation.x = (widget->allocation.x + widget->allocation.width - + (label_requisition.width + + border_width + focus_width + focus_pad + + expander_size + 2 * expander_spacing)); + label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad; label_allocation.width = MIN (label_requisition.width, -- 2.30.2